bitkeeper revision 1.1389.5.31 (427c96cfOpa2KErBqa0pO1osWWIb6Q)

pci/direct.c is no longer patched in arch/xen/i386, so arch/xen/x86_64
must symlink straight to arch/i386.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile b/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile
index d6a253a090e083677845e7505d58e2c817610ee4..47dbc45daa72b7f7d47737610ea6536a43b9e41d 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile
@@ -12,7 +12,7 @@ c-obj-y               := i386.o
 c-obj-y                += fixup.o
 c-obj-$(CONFIG_ACPI_PCI)       += acpi.o
 c-obj-y                        += legacy.o common.o
-c-xen-obj-$(CONFIG_PCI_DIRECT)+= direct.o
+c-obj-$(CONFIG_PCI_DIRECT)+= direct.o
 c-xen-obj-y            += irq.o
 # mmconfig has a 64bit special
 c-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o